Check ACK payload_len before memcpy, not after#1665
Open
weebl2000 wants to merge 1 commit intomeshcore-dev:devfrom
Open
Check ACK payload_len before memcpy, not after#1665weebl2000 wants to merge 1 commit intomeshcore-dev:devfrom
weebl2000 wants to merge 1 commit intomeshcore-dev:devfrom
Conversation
Both ACK handlers (direct-route early ACK and flood ACK) copy 4 bytes from the payload before checking payload_len >= 4. Move the bounds check before the memcpy so short ACK packets are rejected without reading stale buffer data.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Severity: Low
Summary
Both ACK packet handlers in
Mesh::onRecvPacketcopy 4 bytes from the payload viamemcpybefore checking whetherpayload_len >= 4:memcpythenif (i <= pkt->payload_len)memcpythenif (i > pkt->payload_len)When
payload_len < 4, thememcpyreads stale data from within the 184-byte payload buffer. The result (ack_crc) is discarded in both cases — the subsequent length check prevents it from being used — but the ordering is incorrect.Fix
Move the
payload_len >= 4check before thememcpyin both locations. Short ACK packets are now rejected without touching the payload data.Test plan
Heltec_v3_companion_radio_ble